Tom Francis's patches