Assignment update
some fix