Update Josiah's fork