tmp cm
littel refactoring
Merge branch 'feature/shoots' into develop