updated Screen class