Added self-timing