Save parser much improved