first merge of john stuff