In the 1580s, the conflict in the Netherlands drew England into war with Spain, creating a further menace to Spanish shipping. The effort to neutralise this threat led to a disastrous attempt to invade England in 1588, however, the disaster of the English Armada the following year managed to return the balance between the belligerents. The defeat of 1588 led to a reform of fleet operations. The navy at this time was not a single operation but consisted of various fleets, made up mainly of armed merchantmen with escorts of royal ships. The Armada fiasco marked a turning point in naval warfare, where gunnery was now more important than ramming and boarding and so Spanish ships were equipped with purpose built naval guns. During the 1590s, the expansion of these fleets allowed a great increase in the overseas trade and massive increase in the importation of luxuries and silver. Nevertheless, inadequate port defences allowed an Anglo-Dutch force to raid Cadiz in 1596, and though unsuccessful in its objective of capturing the silver from the just returned convoy, was able to inflict great damage upon the city. Port defences at Cadiz were upgraded and all attempts to repeat the attack in the following centuries would fail.