Updated the scope setting system