fixing
almost done