redo some updates