initial changes with Craig