a bit of tweaking