3.0
Revert "3.0"

This reverts commit 667309e4747e920ed4940c7737cdc8b149a6dda8.
3.0 upgrade
fixed bug