performances enhancements