Further changes and merging