Improve increment_flair