Adding Tor and Lahana