Added Wave to Rainbow, added variety