[Change] Trying to get the oct tree right. There is some bug though.
  -- I'll investigate later.