get rid of ++ and rewrite the last place to use +=