Add temporary range checks to the screens