Samuelsop's patches