Attack improvements