Integrate changes made by Siva