working on demo and testing