Finish phase 4.3 and 4.4

Finish phase 4.3 and 4.4