Better performance by reducing token usage to only one at a time (also added an option to revert to old behavior if desired)