finishing code conversion to new-style cmds