more porting
more porting progress