Merging Prof. Sharat's changes