continued work on demo
some changes not sure what