updated shield2/weapon2