added screens and screen wait
added screens and screen wait