Edited node generators again