Improve attack logic