Fixed parsing order - got mostly working check