update for new fluff diff format