Final tweaks
Merge