Speed things up even more