Trying to pull Naoki's Changes

Here goes nothing