edited for demo
small changes