More work on video code