TODOs update
Replace the clock with ticker which is waiting for pull to finish