tweaked the Salamander name issue