Refacroring for SLM #3