Extended version