Further imporvements