mm: some changes