Another update of same code.