moved settings to right place