new script, some changes