Changes from Yura 0.90