Redid everything to match fork