structural improvement and fix