structure fix part 1