a few modifications and a new script