Updated delimitMate