enhancements but still slow