(separate commit since when copying and modifying in the same commit, hg doesn't seem to show differences)