Changed max waiting time from 60 to 30