minor change
more performance improvements