Removed context-sensitivity