Does the validity check belong here?