more porting to apollo