Tweaking the code