move default date check above Friday date check