Changed up some Methods