more apollo porting