(possibly) optimized the quickfill
Merge branch 'master' into concurrent