Revert "Simplify and make attack easier"

This reverts commit bfb6ef9bc8f71684cf71275650d9fccbaded892e.