altered some loading stuff