Validation updates part 1