Second draft of youtube support