merge Patrick 2