Updated to latest settings