todo and test_stable update