added screens and screen wait