Not yet optimized, includes additional accumulator