New version with solution for choice