Done implementing code to handel different delimiter