Johnwally's patches