Updated parse2, going to delete