Updated EquipmentGen