Sped things up considerably