changed map to oldMap