enhancement of attack header and add weapon class