Flyer methods refactored