Improved integration speed a bit