More work on scaling demo