Optimize speed and yml