More porting to apollo