Some changes and new script