Still haven't improved the performance, we really need to read some more