a little bit of tweaking