Minor changes to better suit akigawa