Advanced gizmo

fixed