Changed names and added Node variables