merging with malcolms changes