some strucutral improvement