reverted a couple changes for ease of update