checking in for andy to review custom fields