edited run and setup