Revert "bug fixes"

This reverts commit a7d58c6692b2906fd73e2d7f240f75778b3325f4.
added new method[5]