modified for newest node