Update of Assignment with functions completed