Improve a little bit