Continued implementation of changes to SLaM.