Some more improvements: