Sync commit (Working on moving things to NodePool class)