updating the code so its all in parsing order