Added other changes