o Some performance improvements