New wave system, they are now maped and not random.