updated onvalid references