Changed up some code