Revert "changed bp location"

This reverts commit ac6feb846e781087d1fe5e69ebdf352c55be9d6f.
Revert "Traps"

This reverts commit 36eb1e2fc1feb4b1a784e2f306783983b10f6323.