Made some updates to fix  Empty delimiter error