Continued implementing changes to SLaM.