added automatic quoting