Added a new before route, and updated the old waitOn route