merged last changes from zoom functionality