Some more protection over previous version