playing with node system
fixed merge conflict