refactored along with comet mappings