Notice is now the first resource
Minor improvements