Add start on optimizations and parallelization