Updates to 3 scripts