more departure improvements