Added choice + other stuff