Dealing with patches while being as tidy as possible.