Cmp1
Shooter fixes. CMP2