Added WAA and hooked up with graph