canlii overhaul -- works well!