Small fix and Parallel commit