trying to fix some more shiat