new version of Isolation, add EventShape variables