Working to a Stable version!
Update for changes in CanaryUtil