- improve cumulation code a bit