added OneVar function and ;o mapping