Improve script
Improve script