changes for VoD (not completed yet)