Added back other settings