Updated to only validate date