Fixed shit part 2