parser working
tweak parser