Moved Q1 checks