Almost done for 1st Naoya's request.
almost done for naoya's request