Improve

Let's merge to master...