#11 improve scripts