major combat changes!