version with same fixes and whithout video