more typooooooo fixessss