Some revision added to Screen.py