More edits for Suzuki-san