Removed shuttle at the end