Better tracking of now playing