Made some other changes