Update design for MW solution