improve things a little bit