Keys changed to be in downcase
check_valid? converted to time_valid?