Latest changes, final
Merge