removed canonical since I was not usig it anyways...