Changes after merge, trying to show validation correctly.