fixing merging issues from Prateek's files