Some chnages to old code.
Some more chnages to old code.