more porting r57