Updated to the new scope setting system