refactoring with new SLAModel