updated shiz that hopefully works