Task: Improved hangar code