Tetsuo's two patches