loads of changes till halfway phase 2