Upgraded to Canari v1.0