fixing shit part 2