Hopefully will fix slow load times