Changes made to work with Videolab