bringing demo 1.3.2 and demo2 closer together