Updated version with music bugfix