updated

consistent with latest changes