All seems to be working on demo 2