Tweaks in the code