Updated to use WaitForVisible objects