Successful merge of Lucy's and my files