Improving the song model.