brickbreaker merged inside
Brick breaker managers code refactor