norme corrected, ready to copy-and-push