Added initial loading code