Minor Tweaks - Refer to last commit