almost done fixing i think