Updated to add WaitForVisible calls