modified for choice