Updates in setup to separate setup and run.