Fixed chrono and improved set_up