Combat feature re-added