Modifications to work on Canary.