Feat/protection

Codeeeeeec