Reverted a couple changes