More work on combined map/epi