Minor Tweaks to make output match Chetans