some other changes that I have to merge now
merged things