A bit of tweaking