small changes for July 21st 2013 demo.