Translation porting part 2