Demo3 mainly done