Speeded it up (hopefully)