initial changes for loader