changed names and removed modes