Improve Script