merge Jack's changes