Add working code without hop count, arrival and departure