Modified echo and yodel classes.