Undoing some of the damage to implemation