Try some improvements