Speed improvements.