Finish phase 4.2

Finish phase 4.2