- some changes, still cannot get the right results to be persistent