Andded script and some new features