Screen works correctly
New Screen
Refactoring