Added logic for entire screen