Fixed loading bug, improved speed