Mega fix part 3