changes from paxy repo to Shylock repo