Added some childproofing