Tweaking things around a bit