few changes for merging