removed need for initial screen check