Initial patch for Mozart 2.