SLURP changes (probably from rebasing)