Added changes made by Shivalik and Amber in the past hour.