reverted to naive updating again. works quite well on small toy set