Rewrote listMap