demo 2 almost done