Added Some modifications
Added Some modifications2
Fixed version for Demo