update script to be more complete