switched to field ids instead of strings
merge conflicts