Made comment non-optional fields actually non optional.