Samwise's patches