minor performance improvement, and drying