added ability to accept comma-delimited data