Added proper waiting for groom step.