Tweaks as requested
Tweaks as requested