fidi's stuff that i overwrote