Screen class updated