edit some features but still unstable