Updated: delimitMate