more updates for validation