change in Node and SourceType again