re-commit. structure fix
another re-commit