Task: Improved Hangar