improved newwave map