Lots of work on patches