changed: structure fix