Made parsing do more things