changed Screen logic