keeping work on Combat view!