Update and Fix Leblanc