Merge with pratik changes