Replacing old canonical function.
Rearranging repo.