Some changes.
Removed delimitmate.