Finally some improvements