WAM redesign