Edits from Shohei