Changed the way things are loaded, need to improve