#10 fix + music