Make it better, faster