more changes for merging