Made some improvements (by dix)