SQUASH ME: proper waiting