Changed presentation slightly