updated for msw