restructuration - resolution bugs