updates & comments from Goetz
add call for music