Scripts for issue #35