progress in rewriting of the code