improved script, add package