slight redesign off idmap