Fixed the scope level stuff