-Codechange: some progress