more modifications in prevision for mpv support