updating to my latest settings
added in my latest changes