rearranging
improvements
fix name
Merge branch 'feature/ping-pong' into develop