Improve loading system