adding fields to attacks
Merge branch 'Colin-Dev'