enhancements to performance 808373