added parsing functionality