Update to latest code

Updated code