adding updated version of input parser