Made other changes