Continued working on demo 03