removes waiting list code first go
merges in waiting list changes