Improve idemptoence of script