re-organized m3s