Improved the mashup example.