update to merge Wave 3