Added Mattea, and also added the "Both" option!