changes to user and settings model