Improved Zoom Behaviour
safety