Lots of changes including nearby slicing