enhanced script.
Bugfix CLI