Updated for first nodes