Soundcloud stuff
Fixed merge issues