Tweaking the implementation.