merge in 2d isolation cut stuff from susan