Changed up stuff