Arrival Shuttle& Fixes