More merging of what Ritesh and I did