added weapon and shield