Demo 4 added and some bugs fixed