Reimplemented and "improved" old video handling