Further script modifications