Modification partially done

But have to debug zoom problem.