updates for performance improvements