small changes, made USER_FIELDS constant