Revert "added more bugs"

This reverts commit c6aba94c09dec8d5b7290782c725ed4d1bed1e30.
Merge remote-tracking branch 'origin/bahobranch'