phase 2 updates
More phase 2 updates