New version to solve upgrade problems