Fixing up the consumer