settings in dev
merge Jason's commit