Change implementation of boundary and bubble crossings