more work done on the custom fields