updated for damage tracking