Made changes for Amit