change parser + add methods