Further added more protection stuff.