James changes -- extensive