Working towards stable update