Emperor Tewodros II (r. 1855–1868) put an end to that state, reunified the Empire and led it into the modern period before dying during the British Expedition to Abyssinia. His successor Yohannes IV engaged primarily in war and successfully fought the Egyptians and the Mahdists before dying against the latter in the Battle of Gallabat in 1889. Emperor Menelik II, now residing in the recently founded town of Addis Abeba, continued and concluded the policy of expansion of his predecessor, subjugating many people and kingdoms in what is now western, southern and eastern Ethiopia, like Kaffa, Wolaytta or Aussa. Thus, he gave Ethiopia the geographical extent it has today. In the north he was confronted with an expanding Italy. Decisively defeating it at the Battle of Adwa in 1896 with the aid of Russia and France, Menelik ensured Ethiopia's independence and confined Italy to Eritrea.