performance improvements, removed fills