cuz not done fixing yet