Readded parsing to reinit