Merging Dilip's work