Fixing up, using permalinks.