more legacy porting, now confirmed working