Lots of tweaking