applying feedback from tsuna