cleaning up field issues
both versions doing the same