Akshay: Minor changes