Issues #92 (3 additional scripts updated)