Modified for the 20130619 demo