Some imporvements