Some progress, incorrect tree updating