Completed reimplementation for magnifier