Porting sample to the new Aerobatic