SWAVE 2.0