added nodes... again, booleans missing