Changed how things are grabbed, but it didn't help much