Added Choice generation