updated to support decorseparator