Did some improvements