Added the loading feature