work on integration of zoom feature
backport modification from v1.6
backport mod of v1.6
again ... fixing ..