Refactoring sample to use the new style of Aerobatic