fixed alllllllllll da foooomaaatttiiinnggg