various reworkings