GPII-383: Updated with latest sets from claudia