mroe standalone changes -- still not right, but close enough for now