modified custom fields to be simpler