adding changes from canary-local