Comments updated
Build in check if video isn't activated yet