working on .7 changes