Fix previous commit. Optimize scripts.