Updating canary branch to include tooltip changes