Improvements for soundcloud #9