added all variations, changed names