Added the modifications to not pass the screen.