Changed up somethings