Revert "fix and functions"

This reverts commit 4eb91ce0fd47b8253d706ac1e81c6916e1e97327.
Revert "unstable changed"

This reverts commit ca5a94839714ece25043eb50878c8e152508f097.