This seems to be more canonical