improved waiting system