Merging Sanjeev's and my changes to confit into one