Fix splatter

Little bit of refactoring needed to make the splatter method work again.