with new custom fields