Added the if statements for the arrivals