New script with single spatial location, minor tweaks and fixes to allow this important special case to work properly