soundcloud implementation
merge conflicts