Updated choice keys to the current method