Synced with music-score dev