Scripts updated to make better use of recently added functionality