AM Wave done without commits