Porting phase 2 done