Improving previous patches