changed context to Map -- more pragmatic