Updated calculated simple style
Completed Calculated multichoice
Completed matching