added more split parsing
Modified parsing function