now with support for comet mappings