Replaced previous hacky solution for cell name/number mapping with more elegant/straightforward one.