Lots of tweaks
Back to basics