now ms refactor