Only using background music for now.
Merged upstream changes