Updated #15 from reconstruction pipeline
Updated 17 in reconstruction pipeline