Added demo loading and asynchronous loading update