Tyler/Dom - Fixed merge conflict at end of night. Forgot to change the test to new origin in middle of screen