Tweaking the code a bit.