Video class improvement