Move date check sooner