Improved block protection

Improved block protection