Update of latest code

Update of latest code