Additional Changes on settings