More work on script