Update of latest code