Updated key and code