merging recent changes