Merged changes from Vivek into copy on GitHub