changes to accommodate names with spaces