added gizmos (untested)