changes to copy
Merge violasong changes