memory leak change, consts changed