Mega fix part 1