Changed how attack works
merge