Switched to '-delimited strings