Issue #11. Change main script