Just making it more foolproof.