updated .. map for performance