moving gimmicks to extra file