Refacroring for SLM #5