Changed run functions in main