Merging Wondermusics changes