changed to allow more quotes