Revise after MW changes