Perf Improvements for Grid Filling