some changes, but not stable