Redo-ing some mistakes