tunning
added udpate and move by node approach... it is slow, but seems to work