heavy rework to List ifo Map