working version with ZoomCore changed