Added client awareness to current arrival