last bit of tweaking