Significantly improve CPU usage closes #1