Merging audiodude's work