Code updated to latest version