trying to fix 10-frames-only bug
Fixed conflicts