Redo on a couple class files