Continued outsourcing code to ScreenHandler