Removed location, added node number