cherry picked commit - updated simulation time calculations