polishing the mss class