More work on demo and managers