beta 4

Update for phase 2 with corrections