changed map conversion