redo some previous changes