hopefully updated all the parse stuff