fixed this whole thing