SM-Lite changes after 1st iteration