Parser working better now.