Updated for parallel branch