Updated to work with recent versions of SLIME