Updated Screen implementation