primitive accumulation added, revised rest, accumulation still missing