Added run and save functionality