Increased precision; removed integration