More work on the scripts