Enhancements for speed