Made all of the needed changes