Gianna – extended class and demo from 4/6