move checks to a different file