Changed up some stuff