Script and samples updated