updated to remove overruns