Beginning to resolve waiting problem.