debug version update (not finished, not tested)