last merge fix
trying to figure out the validation expressions