starting refactoring of sigma update logic