better video handling
merged