Can now detect deliminators