validation enhancment