Merged with Yogesh's code.