Timing Analysis and small modifications in simulation