more work done on custom fields