Screen added

and some changes