hack to prevent slowdown between clips
fixed merge conflicts