merging more changes