A few tweaks
Merge