New script and improvements