Add demo and improve script