Tweaking both and adding comments