Tweaking the final part ...