Fixed the bug found yesterday, simplified overall loading process