and some other changes