updating to newest giotto conventions