AirImpulse && a small fix