added cool wave
merged from rob