Refactor/more parallel

1. More parallelism
2. Less parallelism :P