tweaked loading system to work