Hopefully better preformance