redo with some hiding