Revert "Preparing for new base and fixing bugs"

This reverts commit 82162ba414e6577d20cf3a9a2a69138cd6798016.
prepare part 1 for new update