Added max waiting time to prevent eternal blocking ;)
removed unneeded waitUtil's