redo stuff some