Improve scripty