rework for WAMP2