Simplyfied attack code and broke out into other methods.
Merged with Steffi.