Removed max waiting time to 2