map waiter sends the old map as well now