Completed update to validation