working version that bumps suffixes properly :)