WAPT 2.0