Modification on ParseLine function, do testing