Some Tokyo updates for @fabiokung. :v: