adding node completion
merging upstream