removed some references and changed names.