preparing to add MWS support