Properly clean spurious entries in waiting list
Adding Enum.sum