Fix and update to tactical