Updated so that we can compute the time to draw correctly

Change-Id: I6d9b705d58478959d70bd805f1c0ff7321e7e2a3