lots of reworking done