Making an update to add additional validation