More script improvment