more changes to assign default value