Added updates to Screen class.