changed some fields to be conditional as per request